Merge branch 'development' into production
Merge pull request #7 from noximus/production

Merge branch 'development' into production