On desktop version.
Merged version.
Merge pull request #1 from egraldlo/on-desktop

On desktop