Merge master to miew

how is it?