Changes for issue #11

Changes for issue #11