merging
Updated to version 2.0.