Merge pull request #1 from ethereum/master

qwerty
Merge pull request #3 from BuildFuture/develop

Merge pull request #1 from ethereum/master