Merge pull request #1 from CST316GroupO/master