Merge pull request #1 from Calrion/master

Relicensing to Apache 2.0 License.