fixed #46
Merge branch '1.1-stable'