Tidied up the configuration and example usage.