Pulling in update from out of sync hotfix branch.

- Pulling in another update from an out of sync branch that fixes a bug
  from the other day.  This fix is for issue #10.