allows stored information across sessions
Merge branch 'master' into merge_test