benmarwick Merge pull request #2 from nevrome/master