Merge pull request #778 from cmorris98/master