fixed #87
Merge branch '1.1-stable'