updates
Merge pull request #7 from cstefanache/taires-branch

updates