Merge pull request #3 from Gurr3/master

updates