Updated to builder 0.6.1
Merge pull request #239 from Shusshu/builder061

Updated to builder 0.6.1