Make production ready
Merge pull request #3 from chendo/patch-1

Make production ready