Updated to snapshot 0.2