Added ugly parserManager (fucking java with 0 relfexion...)
Merge
Merge origin/master