Manually merged Dewayne's pull-request