some fixes
Merge pull request #1 from sikroz/master

some fixes