Merge branch 'gh-pages'
Minor cleaning up
Refactored with better practices
Smooth movement
Fast buffer refreshes
Merge branch 'master' into gh-pages