Merge chutch1122:master from Elyotna:master

chutch1122  wants to merge 6 commits into chutch1122:master  from
Elyotna:master