Safety measures.
Merge branch 'master' of https://github.com/cs2103aug2014-w13-3c/main