Bump version to 0.5.4 and make more robust