commit
Merge pull request #4 from cstefanache/taires-branch

commit