Merge pull request #15 from sync667/master

Bug fix, 2 options added.
Fixed #12, Fixed #6
Changed plugin.yml upsss. Some code clean up, but also a lot of commented parts of code, due to migrating to sqlite.
Merge pull request #1 from maciekmm/master

Test