made changes due to database
Merge pull request #6 from hhelterb/master

made changes due to database