Merge pull request #2 from pborelowski/develop

Develop
Merge pull request #3 from pborelowski/master

Merge pull request #2 from pborelowski/develop