changes made for issue #2 #5

Closed charankumarpalla closed 2 years ago