updated license and notice file
Merge pull request #45 from rogerluo410/master

updated license and notice file
Auto-merge remote-tracking branch 'upstream/master'