Merge pull request #3 from axisthemes/development

Development
Merge branch 'master' of github.com:axisthemes/axis-framework into development