Issue #44 - minor enchancements