Updates to fix issue #41

Updates to fix the issue "Make placement of external resources independent of merge #41"