Merge pull request #4 from ajile/production

Merge pull request #3 from ajile/master