Added missing files (duh ... again)
merged