Added AMD support
Merge pull request #2059 from perkastman/master

Added AMD support