Merge pull request #1294 from aparcar/model