Border solution
Merge branch 'master' of https://github.com/tomking1988/richang