Merge pull request #6 from daniel49/master

Merge pull request #1 from Vengage/master