Added some conditions
Merge branch 'master' of github.com:SalamiCo/ISBC-P5