Fixed Issue #151
Merge from upstream