Partly fix for broken API
Merge pull request #13 from meriko/master

Partly fix for broken plugin