Simplified move() function to a one liner (how did I not see that?)
Merge branch 'master' into gh-pages