Merge pull request #228 from vadhawal/master

more changes for beta