! More logic issues...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1361 from Oldiesmann/release-2.1

! More logic issues...