Merge pull request #31 from BaBuDe/master

(feat) add basic flux architecture and update db
change db query syntax