Merge branch 'master' of github.com:sdecri/fluxomajic
Merge branch 'master' of github.com:sdecri/fluxomajic