Update code (graph completed)
Update userconfig class
Update graph
Merge branch 'master-sonlt'