Merge pull request #51 from museoXela/master

Merge pull request #277 from Migue4/master
Merge branch 'master' of https://github.com/Migue4/Desktop
Merge pull request #279 from Migue4/master

Merge Migue4