Update 2013.06.12
minor changes
merged from vinh