Add option fo always show toolbar
Merge remote-tracking branch 'upstream/master'
Merge pull request #132 from jerv13/master

Add option fo always show toolbar