Merge branch 'release' into develop
Merge pull request #257 from Icenium/fatme/merge-release-into-develop

Merge branch 'release' into develop