fix 0.3.11
Merge branch 'master' into 0.3.11