phase 8
Merge branch 'master' of github.com:rjab/fusion