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

Master