Merge pull request #11 from muellners/develop