enhance auto-set
Merge branch 'master' of https://github.com/PetersBrice/Game_Project
free + enhance auto_set