This issue to go with PR #58
This issue to go with PR #58