Merge pull request #1 from kartikm/master

Misc changes