Commits in pull request !147 squashed and minor code style changes by Adam Honse <calcprogrammer1@gmail.com>