merged last commit from simple-plugin master