Merge pull request #5 from markusgeiss/develop