Develop for 0.5.2-beta