Merge pull request #18 from markusgeiss/develop