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

Merge pull request #23 from We-Know-Fun/master
Merge pull request #25 from We-Know-Fun/master

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