Added copyright holder
Merging basic functionality from private project.