Merge pull request #7 from jurasm2/develop

Develop