Merge pull request #995 from brooksryba/develop

Develop
Fix kwargs in __init__ for models
Merge pull request #996 from demaagdk/develop

Fix kwargs in __init__ for models