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

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

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