modified form2
Merge pull request #28 from EstebanSoler/fixing_bugs

modified form2