update to samvermette:master