Few things
Edited
Edit
Merge branch 'master' into gh-pages
Edit