Beta-Release2

Attempt to merge again...