Parser patch
Merge branch 'master' of https://github.com/csaladin94/masol