some fix
Merge pull request #66 from iShift/patch-1

some fix