fixed #99
Merge branch '1.1-stable'