Per issue #82, I am opening this issue which will supersede 82 with the latest branch but implement the fix for the issue as presented.
