Merge pull request #5 from juju/name-conflict