Initial commit
Fix conflicts when merging master