Changes to project
Merge pull request #147 from gschorkopf/patch-1

Changes to project