Changes on code

i do some changes on your code, each change has a descriptive commit message