Merge pull request #180 from andhieka/working

Parser Suggestions
Merge remote-tracking branch 'upstream/master' into working