test branch
Merge pull request #13 from smonette/new_b

test branch