Merge pull request #1 from ethereum/master

qwerty