Merge github.com:nbhartiya/MVP
a few other issues
Merge github.com:nbhartiya/MVP
small fixes
merging with master