Prepare code for deployment
Merge pull request #1 from falker/master

Prepare code for deployment