m&a
Merge https://github.com/JessenPan/ZYNLPJPT
Merge pull request #17 from AoteChou/master

f&m&a