merge tag 1.5.3
fix little bugs
fix makefile error