Data manager class
Data manager class
Merge branch 'master' into JM_0.0.1