Optional desktop target
Merge pull request #515 from aesedepece/dev

Optional desktop target