Fixing copyright headers and wrong ending tag for pull request #106

Change-Id: Id2db76276d6dbb6092cbdfbd68c0c52dbb7d3ec3