Branch 1

Sync master with Jonas Branch