Revert "Merge pull request #3 from icompuiz/master"
Merge pull request #6 from icompuiz/revert-5-production

Revert "Merge pull request #3 from icompuiz/master"