Merge pull request #1 from purepleya/master

Merge..
Merge pull request #2 from HappyBerrysBoy/master

Merge pull request #1 from purepleya/master