Fix #171
Merge origin/master