fixed #88
Merge branch '1.1-stable'