Bug fix #192
Merge remote-tracking branch 'origin/master'