updates
Merge pull request #2 from Bnaya/updates

updates