Merge pull request #72 from raghuvissu/master

some bug fixes
.
.
.
Merge remote-tracking branch 'upstream/master'
.