bug fix
minor change
v1.5 much faster