Merge pull request #12 from Lozov-Petr/model

New conflict.