Change the way the config data is stored to make it easier to change it
Use tmp now for storage
Merge branch 'develop'