quest for 100% test coverage
Merge branch 'enhancements'