Merge pull request #24 from dkorolev/master

Refactoring + Licenses.