#FLUX-44
Performance and code review
Merge branch 'master' of github.com:sdecri/fluxomajic

Conflicts:
	README.md