Toolbar support
Merge pull request #594 from godarklight/toolbar-integration

Toolbar support, Fixes #507