Merge pull request #2 from Geodan/master

fixes from tom