Merge pull request #1 from athenajs/dev

Dev