Hotfix1

Merging into master with the updated changes.