Merge pull request #1 from jonasstein/master

Reimporting
Class definition, cleanup, improved table creation.
Merge remote-tracking branch 'upstream/master'
Cleaning, unittest mockups, basic DB operations.