Fixes issue #128
Merge from beta