Merge pull request #3 from flashingpumpkin/master