Updated models
Merge branch 'master' of github.com:KyubiSystems/Yomiko