Fixes missed from the earlier commit
Merge pull request #89 from BadriL/master

Fixes missed from the earlier commits