Changes for 0.2