Working branch for 0.5 release