v1.0

improved performance and matching