Merge pull request #1 from athenajs/dev

Dev
Merge branch 'dev' into gh-pages