merge from samvermette:master