Finish up draft stuff (fixes #139)

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

Finish up draft stuff (fixes #139)