Much better and faster

Need to update the readme... :)