minor tweaks to pull request #14