fixed double if statement
Merge branch 'master' into live