Merge pull request #2 from marcoau/master

Updated database names.