Merge pull request #2 from jerle76/master

gh-1: Change license to Apache 2
Updated headers to incorporate Apache 2 license