[TASK] Rebasing to use latest Flux changes
Merge pull request #26 from NamelessCoder/rebase

[TASK] Rebasing to use latest Flux changes