some fix
Merge pull request #41 from dkrnl/master

some fix