Update to fix the test cases
Merge branch 'master' of https://github.com/kitho/CS3343