License improvment
fix merge conflict
Merge pull request #1 from gotar/change-license

License improvment