Merge pull request #17 from xificurk/next_release

Database schema: bugfix