One more bug fix.
Merge pull request #32 from randy-waterhouse/master

One more bug fix.