Merge pull request #21 from hariadi/dev

Plugin tweaks
0.4.2