fixed #71,fixed #70,fixed #69
Merge branch '1.1-stable'