fixed #86
Merge branch '1.1-stable'