Remove index_formatted and fix bug #10
Merge branch 'master' into gh-pages