Merge pull request #6 from cwisniew/master

Build is now friendlier for certain IDEs
Merge remote-tracking branch 'upstream/master'

* upstream/master: