Fixed issue #555: Thanks to @ofred
Merge pull request #557 from sergeyklay/master

Fixed DB schema