fixed #108
Merge branch '1.2-stable'