Fixed a bug i caused
Fixed the unssuported thing
Merge remote-tracking branch 'origin/master' into SagieBranch