Updated for 0.3.6 release