fixed #80, fixed #79, fixed #78, fixed #77
Merge branch '1.1-stable'