Merge pull request #19 from yanikou19/master

Cleaning of some classes and files
Merge pull request #20 from yanikou19/master

Improvement of the parser