Merge pull request #55 from dodobas/master

production updates