setup .2
Merge remote-tracking branch 'upstream/master'
setup 0.2