added tooltips
Merge pull request #22 from HarrisonDempsey/master

Merge into master
Merge pull request #16 from RomeshPanditha/master

Merge back into personal fork