Use spaces instead of tabs
Make it faster
Merge branch 'master' into gh-pages