Merge pull request #6 from Vogeltak/master

Merged master with dev