Merge in AMD support... 

So lonely ... handling my own pull request!