Added location and description
Merge pull request #13 from Screengoose/newformfields

Added location and description