Some modifications
Other modifications
Merge branch 'master' of https://github.com/rilder/BAmodel