#337 - partial commit (review create parser)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
#337 - code review modifications