fixed #39
Merge branch '1.1-stable'