change Makefile
fix stdout output
Merge branch 'add_ae'