more changes for beta
Merge remote-tracking branch 'upstream/master'
Merge pull request #228 from vadhawal/master

more changes for beta