v1.1.0.332 - attempt to tackle github issue #16 and github issue #19