Pr/29

bbayle's pull request