update
Merge pull request #6 from cstefanache/taires-branch

update