Update/ami

@ctb can you take a look and merge this. Please ensure dragon is seen to public first though! =)

#57