Updated to builder 0.6.1

Builder 0.6.1