various changes for the plugin's mechanics
Merge pull request #3 from teresko/master

Various changes for the plugin's mechanics