Issue #50 merge from master