Merge pull request #45 from pioneerit/dev

H/W 3 fix merge
asd
Add Models validation and repair some factories
Merge pull request #61 from pioneerit/issue_57

fixed #57