Merge pull request #1 from SharedFriend/master

test
Merge pull request #14 from jizon00/master

Merge pull request #1 from SharedFriend/master