Merge pull request #4 from mgeiss/develop