Fixed #380
Fixed #382
Fixed #383
Merge branch 'master' into 383