Add clone feature fixes #75
Merge branch 'feature-clone' into development