if-else conventions
Merge pull request #1 from wuher/if-else

if-else conventions