Update to pass google cpplint
resolve merge with Marty's commit