Latest changes from opdenkamp's repo

Latest changes from opdenkamp's repo