Build 0.3.6