Merge pull request #1 from linuxmint/master

Update