Issue#15 clone rollback

Fixes #15
Fixes #11