Merge branch 'master' into saving_functions
Refactoring.
Merge branch 'saving_functions'