Merge pull request #207 from ThePyrotechnic/Dev

You want a comma? No? Fine, have it your way.
Merge pull request #208 from ThePyrotechnic/Dev

It’s dangerous to go alone; take this!
C-c-c-combo breaker!