make changes recommended in Issue 97

I needed these changes and since you asked the other fellow to make a PR and he didn't, I figured that I would.  I hope that is okay.  Thanks!