fixed #32
Merge branch '1.1-stable'