Merge pull request #1 from patrickhuber/master

merge dev to master
Merge pull request #2 from patrickhuber/dev

Merge pull request #1 from patrickhuber/master