Merge pull request #1 from kenleezle/master

database.php