fixed the if statement
Merge branch 'development'