add an enhancement
Merge branch 'master' into enhancements