Merge pull request #11 from We-Know-Fun/development

Master
Merge pull request #12 from We-Know-Fun/master

Merge pull request #11 from We-Know-Fun/development