fixes parallel ISSUE 72
ISSUE 72 merge