merge biocro-module2 branch