update to the latest code @2014-02-13