20130531 almost final ready for test

almost final ready for test