Fix #130
Merge remote-tracking branch 'origin/bug/130'