Minor fix and updates
Merge pull request #19 from ajayk/master

Minor fix and updates