fixed #37
Merge branch '1.1-stable'