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

updates