New data
Misc code refactoring
Merge branch 'master' into gh-pages