Refractor if statement
Merge branch 'master' of https://github.com/wnmp/wnmp.git