fixed #56
Merge branch '1.1-stable'