Updated for 0.5.2 release