Bug Fixed-Issue 1 & 2

Bugs - Issue 1 and Issue 2 are fixed.