Merge pull request #3 from Markkus1337/master

Merging