Updated for Beta 4 and fixed physics bug