merge 0.3.2 changes into my test peershare branch