Merge pull request #4 from CMPUT301F14T03/master