Base on new build plugin api
Address daryl comments
Merge pull request #5 from stephanenicolas/issue-4

Base on new build plugin api