some fix
Merge pull request #2 from zvirocode/master

some fix