Added some of mah changes.
New license - Fixes #1
Merge pull request #2 from bearbin/license

New license - Fixes #1
Merge remote-tracking branch 'upstream/master'