Updated to version 2.0 beta4