Always use {} and a check
Merge pull request #1 from sagivf/master

Always use {} and a check