modifying license
v1.0 merge