Version bumped, minor project adjustments
Merge pull request #400 from enemaerke/master

Version bumped, minor project adjustments