Updated Marla, Starting to add multiple output types to allow for fancier output :)
Merge remote-tracking branch 'origin/master'