fixing if statements
Merge branch 'dev'