the features we got so far stage 0
Merge branches 'master', 'testing' and 'master' of https://github.com/KBarros2014/TEAMB