Fixes #535
Merge pull request #570 from ryansmith94/patch-1

Fixes #535