Merge pull request #14 from jizon00/master

Merge pull request #1 from SharedFriend/master
Merge pull request #2 from SharedFriend/master

Merge pull request #14 from jizon00/master