fix
Merge pull request #26 from rgschneider/johanna_feature

Johanna feature
fixed database script
Merge pull request #27 from rgschneider/robert-feature

Robert feature
revision