Get ready for production usage
Merge pull request #6 from realigram/vik/dev

Get ready for production usage