Merge pull request #2 from claudioccm/master

Forms and Bugs