Changes for review comments and Issue#4

Changes for review comments and Issue#4