.
.
#38
Fixed #35
Fixed #37
Improved db, improved listen (to be changed)
Merge branch 'develop'