merge License into dev #11

Merged
_N0x merged 2 commits from master into dev 2 years ago