error message changes; this is going to be tagged release 2.3.1
Merge branch 'master' of https://github.com/bsanders/softeng
Merge branch 'master' of https://github.com/bsanders/softeng
replaced some logic with an existing function