merging dev for new release v2.0.4