Initial commit
Merge upstream and first commit