Perfer next over conditional blocks
Merge pull request #317 from geniou/next

Perfer next over conditional blocks