more performant, dep free version
Release 0.7.0