Merge pull request #15 from 3stadt/develop

Minor Fix/Enhancement
Merge pull request #8 from ronsn/develop

Merge pull request #15 from 3stadt/develop