fixed!
Merge pull request #49 from pisi79/master

almost fixed