Fixed #13: Deployment and staging
Merge pull request #37 from dpobel/13_deploy_stage

#13: Deploy and staging