Fixed license.

closes #169
Merge branch 'origin/master'