Fixes #70.
- Need to clean up with better implementation and error handling.
Merge pull request #76 from cs2103aug2014-t17-3j/Issue70

Fixes #70.