Merge pull request #2 from Carlows/master

sad