(PR #30) Issue #32: Following on PR review comments
(PR #30) Issue #32: Following on PR review comments

mrvisser/Hilary,ExC0d3/Hilary,jfederico/Hilary,simong/Hilary,simong/Hilary,Coenego/Hilary,stuartf/Hilary,Orodan/Hilary,mrvisser/Hilary,nicolaasmatthijs/Hilary,ExC0d3/Hilary,nicolaasmatthijs/Hilary,timdegroote/Hilary,timdegroote/Hilary,Orodan/Hilary,jfederico/Hilary,stuartf/Hilary