Revision for issue #106

Revisions as requested.