Fix #153 and #155: Need definition for 5.5.4 and 5.4.20

Fix #153: Need definition for 5.5.4
Fix #155: Need definition for 5.4.20