minor enhancements - issue #311