Revert "Revert "Merge pull request #3 from howardgrigg/small-fixes""

This reverts commit 283b0aa8b3000c216e87c4efab2add18fb23b8fa.