fixed #74
Merge branch '1.1-stable'