Merge pull request #21 from mandreko/master

Fixed shit