Merge pull request #7 from jsimonelli/jsimonelli-fixes

Jsimonelli fixes
fixed License copyright
fixed License copyright