Merge pull request #2 from scaperoth/master

merging