Added maria's changes
Merge branch 'master' of github.com:cbcrg/benchfam