update to latest development May 17 2013