fixed #109
Merge branch '1.2-stable'