Updated license and minor README changes
Merge branch 'release/v1.2.1' into develop

* release/v1.2.1:
  Updated license and minor README changes