fixed #52
Merge branch '1.1-stable'