Added license
Issue #9
Merge branch 'dev'