changes..
Merge branch 'master' of https://github.com/wikii122/tin
changes part2