Merge branch 'release/1.0.4' into develop
New version. Change relations. Add more tests
Merge branch 'master' into develop