update to 1.1.0
update to 2.0.0
Merge remote-tracking branch 'origin/master'