Addresses #659.
Merge pull request #660 from mjordan/master

Addresses #659.