Proper conditional brackets
Merge pull request #1 from matschaffer/master

Proper conditional brackets