Merge pull request #8 from Northcode/master

p
Merge pull request #7 from Jenjen1324/master

p