Update with latest changes from opdenkamp's master

Update with latest changes from opdenkamp's master