Merge pull request #1 from arago/master

pull
Merge pull request #31 from p1tz/master

merge
Merge pull request #2 from arago/master

merge
merge whatever
added logging in JSON format to database
Merge pull request #32 from mglusiuk/master

merge
Merge pull request #18 from arago/master

update