Merge pull request #1 from sirleech/master

update Ben's tree to match the current master
Merge pull request #39 from unwiredben/master

Update Ben's tree