Merge pull request #79 from vishalvijay/master

All fixes
Merge remote-tracking branch 'upstream/master'