adding features -- cleanup & so
Merge remote-tracking branch 'gh/develop' into develop