added license
changed comments' formatting
Merge branch 'master' into addressing