Changed compilation output file
Merge branch 'master' into parser