fixed #90
Merge branch '1.1-stable'