shippitydooda
Merge pull request #542 from Lokiamis/Bleeding-Edge

Small fixes