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

gf
Merge pull request #4 from Sumanguru/master

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