Merged pull requests, added AMD support