bugfix. New version: 1.2
Merge remote-tracking branch 'remotes/origin/master'