Merge garden20/gardener pull request #16 from garethbowen/gardener.