Merge pull request #7 from markusgeiss/develop