Fixed #51 and updated to 4.2.5