index as  api doc
Merge branch 'master' into gh-pages