Merge recent changes in master to we_ahrens
There have been a lot of changes in the master branch and I want to keep we_ahrens up to date and therefore compatible with master
There have been a lot of changes in the master branch and I want to keep we_ahrens up to date and therefore compatible with master