Revision for issue #306

Revisions as requested