failed modification to amake that it might take an argument
Merge remote-tracking branch 'origin/master'