Fixed forms
Merge pull request #7 from monroepe/fixing_forms

Fixed forms