fixed #42
Merge branch '1.1-stable'