Merge pull request #233 from tomvantilburg/master

merge from Tom
Merge pull request #57 from Geodan/geofort

Merge pull request #233 from tomvantilburg/master