Moved values into configuration.

This addresses issues #15 and #16.