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