Merge pull request #6 from altsai/master

fix a lot of stuffs
v11.3 comment inlined
Merge pull request #7 from zapion/master

v11.3