Added environment variable to set DB. When using Travis, uses static implementation
Merge master