Changes for 0.5.4