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