Change namespace + url
Fix @grant
Change style adding
Fix indent
Merge branch 'master' into gh-pages