Merge version 2.0 with master