Merge pull request #20 from manleyjster/master

Fix issue with multiple toolbars appearing on each image, ensuring that each image only ever has a single attached toolbar.