Update 20140711A

Little changes