Toolbar working.
Merge pull request #20 from dgarzon/master

Toolbar working.