Issue #50 integration from master