fixed #22
Merge branch '1.1-stable'