Merge branch

Adding MemberOf to struct