Added ifs
Merge branch 'master' of github.com:em-mo/TDDD56
Improved ifs