merging changes from 3.0.1
12 files changed