some changes
final changes
Merge branch 'master' of github.com:newca9h/test