Merge changes #3

Closed
KP2048 wants to merge 4 commits from master into master
Showing only changes of commit e4dcdae3b3 - Show all commits