Release 1.6.24

Added 5971