Update 2013.06.12
Merge pull request #1 from vinhtrinh/master

Update 2013.06.12