decouple if statements
decoupled if statements
Merge branch 'master' of https://github.com/monalv/WebMashup