added some missing files
merged with master