Small syntactic changes
Merge remote-tracking branch 'origin/master'
Licencing information.
Merge remote-tracking branch 'origin/master'