Merge pull request #820 from brendanzagaeski/master