Ref #45
Merges