edit codeit
Merge pull request #2 from jdumayas/newfeature

edit codeit
Merge pull request #3 from jdmillan27/b1

B1