fiexed #40, fixed #41
Merge branch '1.1-stable'