Update 20130728
Refactoring 20130728