Merge pull request #3 from adlpz/master

Bugfixes
Refactor
Added validation of imported entities. Refactoring.
Refactor