Updated for 0.5.16

Updated for 0.5.16