with assaf3.R
Merge branch 'master' of github.com:johnros/voodoo