Merge pull request #63 from azotova/master

Prepare for deployment