added faker
Merge branch 'old-state' into dev