Merge pull request #1 from d11e9/master

Grab eth work in progress from @androlo
Fix indentation
Merge pull request #1 from projectdnet/master

Fix indentation