Initial commit
Merge https://github.com/Asken/DataCollector