Initial support for multiple sources
Improve max_width (issue #7)