Merge pull request #3 from slowjack2k/develop

small enhancements
Merge pull request #4 from slowjack2k/develop

changed includes
Merge branch 'master' into develop