implemented fork using OO
Merge branch 'fork' into develop