Merge pull request #1 from rluders/develop

Develop
Merge pull request #2 from rluders/master

Merge pull request #1 from rluders/develop