Updated to 0.5.4