Additional fixes suggested in patch review
Merge pull request #100 from tgtshanika/master

Additional fixes suggested in patch review