Refactor
Added validation of imported entities. Refactoring.
Refactor
Fixed tests and removed old code
Old param
Merge pull request #4 from adlpz/master

Improvements and refactorings