More robust project parsing
Merge pull request #138 from bjwbell/master

More robust project file parsing