first from desktop
Merge branch 'master' of git://github.com/ssmm26/memahshid