Resolves issue #147 in regards to conflicting licenses.
Merge pull request #149 from acmiyaguchi/develop

Resolves issue #147 in regards to conflicting licenses.