Added Apache 2.0 License
Merge remote-tracking branch 'origin/master'