This should fix #51
Merge pull request #58 from bpross-52n/bugfix/51

This should fix #51