Skip to content

Improve parsing

Improve parsing #760