Merge pull request #2 from bhalothia/master

merging dev with master
Merge pull request #3 from bhalothia/dev

Merge pull request #2 from bhalothia/master