Merge pull request #38 from gary-pei/master

Address issues raised by Nathan