add sherpa-samp text and fix #4

Also add some auxiliary commands
Merge remote-tracking branch 'origin/master'