fixed #102
Merge branch '1.2-stable'