Corrections and improvements in commands of  1st stage work
Merge branch 'master' of https://github.com/zegreg/Shelf