Merge pull request #5 from klimser/master

Corrections for models
Some fixes
Merge branch 'some_new_features'
Some fixes
Merge pull request #1 from meniam/master

Changes