some changes
Merge branch 'master' of github.com:luckyx1/NACLA_2.0