Some production configuration updates
Merge remote-tracking branch 'upstream/master'
Merge pull request #55 from dodobas/master

production updates