Merge pull request #13 from hreikin/devel

Devel
re-add license
Merge pull request #15 from hreikin/master

merge