Fix Python 3 failure on CLI tool. Closes #26