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

Fixed many bugs