bug fix
Merge branch 'master' of github.com:jchengj/desk