Merge pull request #1 from Geodan/master

merge from master