Merge branch 'master' into develop

    -    merging the fixes back into develop
Merge pull request #2 from drexonita/develop

Merge branch 'master' into develop