Fixed bugs
Merge pull request #8 from eye-of-dev/work

Fixed bugs