Fixed memorisation when not using .db databases
Merge branch 'develop' into feature/function_templates