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

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

Master