Fixes #30 making things configurable