- Updated for 0.5.4.