Merged Daniel Lang (Oscar) Pull Request to Master