Merge pull request #236 from stayradiated/master

Update