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

Merge pull request #17 from We-Know-Fun/master
Merge pull request #19 from We-Know-Fun/master

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