Merge pull request #57 from Geodan/geofort

Merge pull request #233 from tomvantilburg/master
Merge pull request #234 from tomvantilburg/geofort

Merge pull request #57 from Geodan/geofort