Return insertion

This PR should fix Issue #77 , the hard way :-)