reboooooooot
Merge pull request #2 from twokul/fixes

reboooooooot