Patch 1

Just and idea to make this configurable, but with reasonable defaults