Adds feature request #564
Merge pull request #574 from ericwfisher/master

Adds feature request #564