Moved parser to separate project
Cleanup
Fixed #54
Fixed #53