misc changes
Merge pull request #4 from ktkaushik/dev

misc changes