Merge pull request #1 from orielsy/od-master

change
Merge pull request #2 from orielsy/od-master

Od master
Merge pull request #3 from orielsy/od-master

adding smart
deleing smart