Updated parser
Merge branch 'master' of https://github.com/pv93/Bromberg