Changes for 0.6.1