Merge pull request #11 from manaweb/master

Dev
Merge pull request #12 from manaweb/wesley

Merge pull request #11 from manaweb/master