Merge pull request #1 from c4hrva/master

Pulling most recent changes.
Switched to Apache 2.0 license.  :)
Included license header.
Included license header.
Included license header.
Merge pull request #6 from ryayak1460/master

Switched to Apache 2.0 license.