Merge pull request #1 from jbadran/master

fix
uppd
mobile