improved randomization of function calls when appropriate
Merge branch 'master' of https://github.com/pablq/bmp_project