Update V3.6.0

Merged Holger Niemann requested to merge Holgers into master

New Caching implemented fix of issue 18 and 17

Merge request reports