Merged trunk into my branch. Lots of errors, as the Payload Struct and PayloadMetric Struct were deprecated [#11]
branching trunk to /branches/i-campbell