munterfinger Merge pull request #30 from munterfinger/develop