Master Branch Code merged with Android branch.......