Fixed a glitch with editing Sort 0
Merge branch 'master' into gh-pages