Issue #52 merge from master