Build 0.6.1