commit in 20140911
Merge github.com:kingangelTOT/ruby_work