final version of the uploaded code, last update of patch 3, so that patch 3 can then be merged to the master branch.
Functionality of both data types have been succesfully tested.