Merge pull request #819 from brendanzagaeski/patch-1