backported if statements from hydro
Merge pull request #24 from guihomework/groovy-devel

backported if statements from hydro-devel