Fixed a bug and prepared for 1.5.4 release