Merge pull request #1 from bhalothia/dev

pushing
test
Merge pull request #2 from bhalothia/master

merging dev with master