Modeling and Validation of a Cross Flow Turbine using Free Vortex Models and an improved 2D Lift Model