Make it work better as a module.
1.1.0