some fix
Merge pull request #48 from dkrnl/master

some fix