Update to version 2.0.3
fix merge error