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

Merge