Fixed some bugs or whatever
Merge pull request #24 from Winston-Chan/nathan

Fixed some bugs or whatever