Merge pull request #23 from Geodan/master

pull request 20140617