Merge pull request #64 from juju/issues/27