change built url, better attributes ordering
Merge branch 'master' into gh-pages