Merge pull request #11 from manaweb/master

Dev