Merge pull request #2 from sthirugn/master

Multiple updates