Minor Update

This update introduces some additional bug fixes, and code quality
improvements.
Merge pull request #75 from MW-Peachy/master

Minor Update