fixed #35, fixed #34, fixed #33, fixed#36
Merge branch '1.1-stable'