Merge pull request #351 from Stibbons/master

Merge Stibb/Guake