Plugin API update #109

This PR fix #109.