BF: versioned to master ready for pull request