PullRequestNov19DharmaDingo

This is to merge the work of Dharma and Rich