Significantly speeded up matching algorithm
Merge branch 'master' of github.com:betatim/potential-spice