initial fix for issue #11

initial implementation of feature requests raised in issue #11