20130717 develop 2