Different, better, solution for #18. Added some more UltiGCode flavored things.