Hugh's answers
Merge pull request #30 from hughsando/master

Hugh's answers towards issue #29