Merge pull request #1 from patrickhuber/master

merge dev to master