Refactor code
Merge pull request #2 from Assios/webparse

Refactor code