Merge pull request #718 from alesliehughes/master