updated
Merge pull request #36 from antonow/patrick-misc-and-toolbar

updated