fixed #31, fixed #30, fixed #29
Merge branch '1.1-stable'