Made a few changes to fix bugs.
Merge branch 'master' of https://github.com/cs2103aug2014-t7-2/main