manually merge pull request #70
minor tweaks