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

delete