some fixes
Merge pull request #1 from imihaly/master

some fixes