fixed #55
Merge branch '1.1-stable'