Last minute bug fixes.
Merge pull request #49 from Winston-Chan/nathan

Last minute bug fixes.