fixed #20
fixed #21
Merge branch '1.1-stable'