Merge pull request #39 from juju/bug/show-controller