Merge pull request #31 from juju/tweaks