Merge pull request #515 from aesedepece/dev

Optional desktop target
Optional desktop target
Merge branch 'dev' of https://github.com/loqui/im into dev
Fix #522 part  1