Sorting out potential copyright issues - fixes #134