Merge pull request #3 from Geodan/master

pull request 20140227