Merge pull request #59 from juju/issues/58