Merge pull request #56 from juju/issues/51