Database support and general refactoring, commenting and cleaning up
Merge remote-tracking branch 'upstream/master'
Merge pull request #108 from petotr-1/master

Database support and general refactoring, commenting and cleaning up