merge nsavage  branch