Fixed ALL THE THINGS
Merge pull request #29 from Winston-Chan/nathan

Fixed ALL THE THINGS