changed license and added disclaimer
Merge remote-tracking branch 'origin/master'