Addresses #592
Merge pull request #593 from JoahG/master

Addresses #592