Merge pull request #182 from sachinkamath/master

Added tooltips, fixed a line and fixed #169