Make sure fields are escaped & formatted correctly
Merge pull request #7 from mvpdesign/develop

Make sure fields are escaped & formatted correctly