Beta merger

Merging with the Master!