Merge pull request #1 from Viva-la-Insomnia/master

gf