updates
Merge pull request #2 from rgschneider/develop

updates