Ready for 0.3.5 final