Minor fixes.
Updated parsing rules.
Minor fixes
Merge branch 'master' of https://github.com/oloktyev/Aachen