Merge pull request #1 from CS3283-CodeCraft/master