Merge pull request #1 from rain2o/dev-master

Merged for production
Merge remote-tracking branch 'origin/master' into dev-master