update with minor speed improvement
Merge branch 'master' of https://github.com/acornejo/jjv