fiexed #106
fixed #103
Merge branch '1.2-stable'