r193
51509cff · small improvements and cleanup suggested by Graeme Gill ·