added form
added final code
Merge pull request #1 from jsogarro/master

updates