Adds functionality for Issue #137

Adds feature from 137 and also changes the default config to make it easier to contribute (took me ~1 hour to figure it out)