fixed #53
Merge branch '1.1-stable'