Issue #73: final tweak for cleanup
Merge branch 'dev'