ButterCup Commit 2
Merge pull request #3 from Mersalin/master

ButterCup Commit 2