Fixes #27 - Drop options.base and options.locations