Feature/amd [#11]