Merge pull request #796 from alesliehughes/master