Merge pull request #6 from mgeiss/develop