Merge pull request #20 from genjix/master

darkwallet!
updated my talk