Add input error messages
Merge branch 'master' of github.com:nfaerber/bookshelf