oded- one more change
Merge https://github.com/Nagasaki45/hackita-thursdays
Merge remote-tracking branch 'oded/master'