update 2013-6-10 improve framework