fixed #73, fixed #75, fixed #76
Merge branch '1.1-stable'