some fixes
Merge pull request #2 from Cepnoy/master

some fixes