Removed $ sign and cleaned up debug code
added uber link
Merge branch 'master' into gh-pages