updated to version 3.02
Merge remote-tracking branch 'upstream/master'