Merge branch 'saving_functions'
Added another Python Path for Windows.
Merge branch 'master' into saving_functions