Merge master Oskar

Merge with Oskar's master to update.