Parser - Bugfix and a new test
Merge branch 'master' of github.com:KIV-ASWI-PL2014/Director