changed imports to minimized, added tooltip
removed debug
Merge branch 'master' into gh-pages