addressing issues and adding tool helper
Merge branch 'master' into feature/toolbar-enhancements
Merge pull request #1172 from ContinuumIO/feature/toolbar-enhancements

Feature/toolbar enhancements