first commit
Merge https://github.com/rex729/Test20141230
123