ubuntu
Merge http://github.com/szhen002/test
add junk