some fix
some fix
Merge pull request #54 from dkrnl/master

some fix