Updated to latest rbuilder