updated to master-version + changes to Character class and Relationship class