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

updates