fiexed #97, fiexed #96
Merge branch '1.1-stable'