Merge pull request #7 from axisthemes/master

Merge pull request #6 from axisthemes/production
Fixed bug reported by JSHint
Merge pull request #8 from axisthemes/production

Fixed bug reported by JSHint