Issue #9 Merge part 2