#218 updates #169 fork test added (not complete) #169 minor fixes