Author Commenting and Licensing
Merge branch 'devel'