Merge pull request #22 from gcala/master

Merge Tool menu by gcala
- Some changes in the tools menu code.