2.0.0

Please create a 2.0.0. branch  so that the PR could be merged in this branch