Merge pull request #14 from We-Know-Fun/master

Merge pull request #13 from We-Know-Fun/development
Merge pull request #15 from We-Know-Fun/development

Merge pull request #14 from We-Know-Fun/master