Merge pull request #4 from PopPopRet/master

half way
fix
fix