Add fork

partial solution to #513