Merge pull request #63 from korczis/master

Fixed domain model issues