Fixed shit part 2
Merge pull request #22 from mandreko/master

Fixed shit part 2