added missing files
merged with master