Includes pull request !87 with modifications by Adam Honse (calcprogrammer1@gmail.com).
Annoying when in CLI mode