bugfix for Parser not initialized
Merge remote-tracking branch 'origin/cc' into cc

Conflicts:
	src/parser.cc