fixed issue #162 with bug fixes

[tarunkumark]

Fixed #162

Check (put an 'x' between the square brackets) everything which applies:

• [x] I have added the issue number for which this pull request is created.