more configuration options, README update and tests