Updated to version 2.0.4 beta