more reliable in parsing AMD stuff

fixes #138
1.0.0-beta3