Bugfixes + Parser-improvement
Instructions for Windows