some fix
Merge pull request #1 from luxcoding/master

some fix