Merge pull request #302 from Jedwondle/master

Added some slight changes to clean up the component directive.
Fixed the tooltip bug found by Lance