am c077ee31: Merge "Added copyright notice and formatted to convention"

* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention