Merge pull request #2 from c4hrva/master

Merging latest changes in the master branch.
Changed license header to reflect proper ownership.
Merge pull request #10 from ryayak1460/master

Changed license headers.