changes
Merge pull request #3 from rgschneider/develop

changes