Merging my fork with Flamesensor

I added on to flamesensor, didn't have permissions to push directly into the MARC.