Improve error messages
Implement option -s
Document option -s
Reword manpage

Also, fix a missing word.
Merge branch 'dev'
Update README