Initial commit
Licence fix
Merge branch dev into master