update for 2.0.0
Merge branch 'jc/2.0.0'