Merge pull request #71 from vishalvijay/master

for production