Initial commit
Merge origin/master
Update LICENCE