Fixed some bugs, added more tests
Merge pull request #73 from tshemsedinov/plugins

Fixed some bugs, added more tests