Changed nested-if and added putExtras()
Merge branch 'master' of https://github.com/mjimen26/MODS.git