fixed #50
Merge branch '1.1-stable'