Refactor to using flux
Merge pull request #114 from rakeshok/flux

Refactor to using flux