Merge pull request #1 from purepleya/master

Merge..