Made matching work
Merge branch 'master' of https://github.com/arroganharrison/sddf2014