two bugfixes to beta in models and classes
fixed conflicts
Merge pull request #55 from voisardf/bugfix

two bugfixes to beta in models and classes