Merge pull request #13 from Winston-Chan/nathan

Nathan
Merge remote-tracking branch 'origin' into nathan