Additional changes for issue #1

Additional changes for issue #1