Merge pull request #22 from gwilliams/master

OprhanProject fixes + Syntax Errors Handler fixes