fixed #23
Merge branch '1.1-stable'