Merge pull request #13 from manaweb/master

dev