Merge pull request #6 from axisthemes/master

Merge pull request #5 from axisthemes/production