fixed changes
Merge branch 'master' of https://github.com/elaksana/ica_mob into elaksana-master