I just can't stand using the word "modular" as a noun when it's actually an adjective.
Merge pull request #1 from mark-otaris/patch-1

Minor improvements