create some fix
Merge pull request #67 from jimmy-sv/develop

create some fix