fixes #682
Merge pull request #684 from berryma4/master

fixes #682