Merge pull request #6 from orielsy/od-master

updates
Merge pull request #7 from orielsy/od-master

update2