Merge pull request #78 from jerv13/master

Fixed issue with toolbar when inline
Merge remote-tracking branch 'upstream/master'