Merge pull request #1 from adomas-s/master

Improved desktop version