m&a
Merge pull request #30 from AoteChou/master

m&a