Squashing changes into one commit

Allow custom properties to be added to payload
added special character handling
changed tabs to spaces