Merge branch 'Updates'
fix syntax error on iPhone
Merge branch 'master' into Updates