Merge pull request #1 from sw897/master

afa
poi
Merge pull request #2 from FormatNani/master

poi