Merge pull request #1 from mgeiss/develop